#1202 Fix to 6645a036a26bd5ba3259f201678eef732a3a6fa8