I'm doing another PR with my own fixes =D