Fix for #299