fixed #26;
fixed #25;