fixed issue with save scope