Final bug fix in auto creating maps/