Fixes #53, no references are necessary so far