feature #82 : Fixing bug introduced when refactoring