Fixed #166 Drop message deserialising makes strange things

Please merge #163 first.