Fixed parallel calls mentioned in #34