Fixed validation issue (#598)