Fixed BUGS 400103 and 400107