Fix for #9

This is a quick-fix for bug #9