Issue-24 solutions