Revert back to sheep; Bugfix