Slightly hacky fix for AFL/PFL button misbehaviour