Fixed bug`