Fixed bug with