Fixes #76

This fixes one of the issues, if we find more we can re-open it