Fixes #3, hopefully.