Fixed 9ee460704bc5d2b12f97dd4bf822ee757a49ab18 #1024