Fix for issue #259. Please verify.