Fix for issue 21

Fix for the #21 issue