Ajay | #3685 | Fixed maps not working - merged with latest martin's code