bug fix for Crissy