Attempt at fixing build issue