Added #1526