fix
fix
test
Quick fix. Added validations.