feature fixed (Christian)