Fixed defects TODO-194 and TODO-195