Pull request 2 ... fixed the fix