fixed #2479