fixed I think, please test