Fix media push and pull bug