fixes #290 and fixes #289