Should this (and the following?) become static again?