Small bug fix, Fixes #8