Hack for bug fix.