Fixing issue #28 once and for all! Grr!