merged bug fix.