Fix for issue 19

Fix for issue 19