kinda applied the patch
fix stuff