Fixed; 1st commit for issue3