Fixed Data bugs

Forgot {}