rethrow bug fixed