This will fix #6 and close #6 it at the same time.