resolved #Issue26