Fix for #302