Not terribly beautiful loader solution, fixes #27