Fixed a refactored method - now there are 2 similar solutions