Bug fix for no data