Build: Add workaround for issue #1