artf822996 - Bug Fixing