Fixed bug (hopefully, didn't test!) introduced in last revision. Wasn't initialising properly the maps