Fixed #415

#415