Fixes Issue #266 item 4