Fix for short dirnames