Fixed #416
Fix #415