fixing maybe bugs?