[PATCH] Random map fix