another attempt at fixing