Fix expansions

This should fix #74