quick fix for new yamop