Fix #758 (closed)
My student finished its simulations and everything seems alright. Do you wish to keep the current behavior for your simulations or are you fine if merge it like this?