Fixed bug which i really hated. Fix #1.