fixed #244 and #239