merging fix for loading issue from sbliven