UPC BUG workaround