Locking one of the static items; closes #473