Expand should use current filename, not just tail of current filename

Sorry, I introduced this bug in #14

Fixed with this simple change