Fix capturing