fixed SongService