fixes #240, #274, #108