commit after fixes for eumulator crash