BUG_13457 workaroud