Review issues fix