Fixed #45

This changes fixed issue #45