Add giving key resolve #507

Relies on pull #572