Fixed it with a quick and dirty trick in 03e5b61