fixed prev. commited bug fixes