Fixed incomplete class def
Merge commit '523a472078af795ab15ba3c20a57b1ed792942ff'