Removed terminateOnEnter #126