fix for simulator use