Fixed #412