fix for  WFLY-100 and WFLY-332