FIX: issue #973 (Repeat not repeating)

This is not a perfect fix.