Fix/564

Implements suggestion made in #564 - a life example says more than a thousand words. :smile:

Tried to test everything myself, but with such a large change I could definitely use a reviewer to test this locally and ensure something obscure did not break.