Fixes expansion of multiple entries: closes bug #1