And handle data-fins correctly

Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>