Default beat logic fix