Fix for #283