Fix for GRILL-541