Should fix github #430
Fixes #25