Fix for failing tests on 64-bit simulator