[FIX] all sort of issues