[FIX] revised code