Fix instance map