Fixed #415