fixed remaining bug