Fixes #17 (thanks Sumeet!)