Fixed mapnode generation