another fix attemp according to rfc 4074