fix two obvious bugs???