Bug: Fixed the bug produced on a non desired refactor.