quick follow-up fixing #17 and #15