Fix/diamond box

Martin Schneiderrequested to merge
fix/diamond-box into master

Fixes code when using box mass model

Edited by Martin Schneider

Merge request reports