Fixed import/export bug