Fix bug with simulation introduced in previous commit.
Merge remote-tracking branch 'origin/development' into development