Fixed # -> ## & ## -> ###