Fixed $self/$c mixup

Main code rev. 1931