Yet more fix to the last commit..