Fixed leak issue