#365 Restored missing class