Better fix than last one