App now can be safely restarted, fixed #61.