Small amendment to original fix, as it did not work in azalea
Need to handle combinations, would eventually break in 5.1 too