Fixes #48?