Actually fixed map plugin