Fixes key binding error and solves #1