AF-918 trying to fix misbehavior