Yet another attempt at fixing buildfile