Fix current() bug on Mac