Fix for #6

Fixes #6