Warning Bug fix