still working on PC bug