[Build] Fix build for issue #320