Readded accidentally lost return and condition