Quick temporary fix for #16