Try to fix validation