partial fix to nextmap, has a crasher!