Keys lookup broken

See #35 for discussion