Fix for metrics