Fix shape bug

Merged Martin Bergemann requested to merge fix-shape-bug into main

Merge request reports