Revert "Revert "fixed a Birger forgot to check on""

This reverts commit f45499e05887f744e6aa74a7656796f0fc56444b.