Fix for bug IGIRTC-153.