Fix for build already in master