Resolving broken build