Fix #1 conditional loading