Fix for #333