Fixed validation / require