Fixed bug for apollo