Attempted to fix OSX bug; added non-swt version