Bug fix and remove unnecessary line