Fixed over agressive refactor