Fixed bug in CGMap