another attempt at fixing the things