Attempt to solve issue 6.