fix for keys on signal