Fix and enhancement