Fixed #418