#33 foldings
@Override
#32 npe fix
(cherry picked from commit afc5fd0)