Fixes the 'self' bug