Fix for #12

This should fix #12