Method fix
Check improvement