this fixes #8 (the 2nd part)