fixed #1127