re-fixed dioscouri/amritasingh-f3#142