Fix for case with no length