finally... fixes #24