[UPDATE] Minor optimization to previous bugfix