isseue #33 fixed