Fixed regreesion introduced inn the last commit