Finally fix #6