Better handling (34/40)

Better handling