Fix bug introduced by #236

RM9709