Small Bug fix