generalize the length fix from before, since this will probably lead to hard to fix bugs again in the future.
generalize the length fix from before, since this will probably lead to hard to fix bugs again in the future.

eholk/harlan,eholk/harlan,eholk/harlan,eholk/harlan,eholk/harlan