Fixed issue when unmapping unchanged features