Fix #77 for play