Bug fix for previous operators