Actually this fixed that bug, not the last one