Firma Issue #1388