Fixing torn refactor