Fix for bug #9

blub.