fix #6 pushed to Master.