Small Bug fix while adding scheme