Fix magellan_keys bug