Working on fixing issues related to #461.