Fixed #11 and fixed timer/fallback