Fixed wrong refactoring in ac4a0bcdd825d414fb896e97dc227219ffbc9e06