[TT-59] Fixed: Segmentaion Fault issue