This will fix #3 and close #3 at the same time.