ticket:4 [^2] fix