Bugfix for loaders +tests