Should work on all platforms now