Fix a big bug ... I wonder how it could possibly work on OSX (-8