Should fix that bug