bugfix on load and load-file