Fix for media parts