Change and remove bug