Hopefully fixed sourcing issue