Fix too agressive refactor