Fixing my previous fix. Doh.