bugs #32,33,37,38,35,1934,41,48,44