Bugfix: only change into moduledir name if existing