fix bug in expandinternals
Merge remote-tracking branch 'origin/master'