Mirror player fix - close #17