Patched a bug with problems with data