meh attempt at fixing