quick fix for YUP tags