Fix for #214