Minor changes
Fixed bug