[FIX] on some functions