again.. fixes Card #17