Fixing issue #272.
Fixing issue #273.
Missed one thing in #273.