327 - Fixing bad refactor