Fix for the new aspect of #93.