Fixed #1193 using #1194