New fix for #648 as previous fix had a mistake.