Fix OS X 10.11.4 freezing issue