Fix for redefine keys not working