Fix metric creation