data handlers bugfix