Fix issue with constant RZ transform
make code more consistant