Fix for keys on incoming messages
0.0.8