Fixed bug changes