BUGFIX: not accounting for short lists correctly