fixed #16; fixed #17