Fixes Issue #273.