Fixed problem with data field