music handling fixed