fixed for Mac