Fixed #66

Hey, who coded these damn classes anyway? ...Oh, wait.