Workaround for issue 140
Version 0.4.13