One more bug fixed