Added countdown fix #23