Fixed bug [