Fix for issue #11

#11