Roy Tam - 2014-02-25

forget to mention, the issue happens when bundle_files = 1.
With bundle_files = 2, the problem does not exist.