Creepy code fragment fixed
Refactored