commit21072014h

removed else condition-eating habit