Hacky workaround for relationships not being resolved (Github #250)