trying to fix this shit bug