Actual fix - now has the correct behaviour