Fixes #1044 - also list directories