DataManipulations.php was a bit buggy