attempt at type fix