Solve issue SPOR-3