Adding fix for bug in add to map from compsoer view