Fixed as recommended on review. BUG #1034943