Final fix for issue #259