more cross platform issues :(