As usuall, another bug fix..