Fix for issue #16

This should fix issue #16