Remove [@] syntax to add IBM i compatibility