fixing from sirna method
Merge commit 'a2cd842cf63a81e399aab6c265c633aedb4816bd'