fixed empty method
Merge commit '0be55da70dd2707da5526e0f6be20984d1798cb3'