Fixed the UT problem