Default calculation bugfix