bug fix on subfile2

Final bug fix test
Merge remote-tracking branch 'origin/bugfix'