fixed bugs 2272 + 2271