Yet another slight improvement to Cuddles