Fixed problem with mass calcuation logic