Fixed map bug..