Another commit for the same ticket #1202