[FIX] Fix some issue when option module is not cleanly create