Fix for bug #9

#9