working again, end of issue #57, issue #113