hopefully this resolves a few things