[R17] a better solution