Revert "Revert "fixed class declaration""

This reverts commit 5e6bd22842a84dbf5ecc3807822627a5814d728a.
Revert "Revert "Revert "fixed class declaration"""

This reverts commit 8d178c014bb16f3e832c0bb1d058017bfbdb640e.