resolved #Story24