Bug fixed hopefully