Load Fix

Hoping this helps with #165. /cc @doolittle 

<!---
@huboard:{"order":5.625}
-->