Updated code to match 8.11 code. Relates to issue #50