Fix BZ1017059