Fixed again the #24 (reopened)