bug on previous commit #SGoo-33 Fixed