Fix for lingering length functions