Fixed map serialisation bug