Don't quote self (should really be fixed now)