Decided to revert that last change and keep the existing logic