Fixed mediaserver #1