Fix Millisecond Crash - Improved