FIX: Better fix to previous issue.