loader: fix issue #6
loader: fix issue #5