Fix for #294