Fix #415