Fix concurrent methods resolution

I will set the correct exception and merge this one just after ;) (as soon as end of working today)