fixed some play behaviour