Little Bug fix