Better handling (38/40)

Better handling