PCT-671: simplified version