reallly fixing bug this time