fix-up internal