xy problem fix (maybe)