Fixes weaknesses failures #43