Removing some bug