Another try to fix that bug