Fix rake system