Partial fix for #479, covers timers