Better fix for preplay