Some more irritation via fixing issue #1