This should fix the bug, that buffer switches are propagated multiple times