more about #6
fixed #7