Fixing bug with sample data