Invalid data: enhancement

New issue