fixed parsing of non-nested blocks