#15 Fixes disappearing bug