i have the same issues, please fix them