Fixed marshaller gen. problem when using multiple devmode sessions