Fix more issues with my sidebyside fix [MJ-562]