Fix nasty bug in combo block