Bugfix. Better data handling.