Handle keys with dash. ref #10