SONATA-429 - Fixed code