Replace faulty logic with a combiner

This fixes the problem with data ending up in wrong places in the bram