fix Issue52