Sample Bug fix