Small bug added while refactoring, now resolved