this commit fixes #738

must include manual added files