SONATA-458 - Fixed presentation