Fix for #37 limit=0