fixes position + map