fixed #77 and #76