Fixed feature issu