Complet fix for #1