Quick Bug fix