Tested on linux and removed the FIXME comment