try to fix that bug #25