Added fix for airplay bug