fix previous commiit #20