Anyhow, my ugly solution seems to be working for the time being at least.