Another attempt to fix that bug