Try fixing build order