Fix removed key adjustment

Close #34