Issue480

fix issue 480 
fix issue #480 
fix issue#480