Fix for build automation