Removed bugs 1195, 1150