[FIX] fixed errors from last commit 682b2056