fixes #17 fixed #
fixes #17 fixed #27