Attempting solution 3 to issue #7