artf787318, artf738095, artf826763 - Bug Fixing