performance fix (for now)