review & fix issue