WELD-407 more strict version