fix #58

This was creating a really bad user experience that's why I fixed it my self.