Fix for incorrect data handling.