(Fixes #4)