fixed #24, fixed #25