Bug-fix

Learning-Fixes