Fix for #206