fixes #25 and #26