Fixed cluster map crash