temporarily work around problem with rethrow (from #20)