fixed #69
fixed #68