A fix for BAU-1107