Load Fix

Hoping this helps with #165.