Build Fix attempt #7