Refactoring fix as suggested by Shrey.