This code seems to work on both platforms, removing TODO comment