James blog fix

Please review. We may want to patch to prod...