Fix multiplatform, removed bug