Fixed zero reference bug with data