fix on default metric + put return value for agregation purposes