Fixes #13 (in upstream)