PR for #337

Seems to be a wrong commit in it, be carefull (commit entitled "Try")