Fix for play23