#33 fixed issue by adding a check ...