Removed the popup and fixes #3