Added workaround for Mac Java Bug