Final version of the bugfix for 572

Fixes #572
Improves upon #573 
@stof because of named transformations later on.