bug fixes'