Fixing self:: calls