Better length handling