bug fixes by Daniel