Another attempt at fixing that bug