fixed #25 and #26