github issues fixes #17