Update wrt ticket #26