Fix for issue 23

This is fix for issue #23.