Addition to bcb93fdc6c. Adding missed class