- Fixed some lost code after last commits