Yet another special case fix