added bugs 29-32