Little fix for simulator testing