Fixed #406