Much simpler than the fix I came up with... Could you remove the commented out code and the FIXME note?