- made some custom fixes until this shit is merged in by the maintainer