Implemented wish #345.