fixes #294
fixes #291