Bugs fixed: Bug #1239791