Fix for #569