bugfix, first data