Fixed, i have rewritten this class.