Card #104 - fix for refactored logic