FiffSimulator fix