[FIX] Better preplay bug Fix