@signal fixes - was missed, wrong type