Bug fix in data interface